diff --git a/templates/category.html b/templates/category.html
index 3a12e0c..8ac5404 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -8,3 +8,7 @@
 <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} {{ category }} Category RSS Feed" />
 {% endif %}
 {% endblock %}
+{% block headnotes %}
+{% if CATEGORY_FEED_ATOM %}&gt; <a href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}">{{ category }} Category Atom Feed</a>{% endif %}
+{% endblock %}
+
diff --git a/templates/index.html b/templates/index.html
index 07ec0c8..1896144 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,21 +1,26 @@
 {% extends "base.html" %}
 {% block content %}
 <header>
-  <h3>Index</h3>
+  <h3>
+    Index
+    {% block headnotes %}
+    {% if FEED_ALL_ATOM %}&gt; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Full Atom Feed</a>{% endif %}
+    {% endblock headnotes %}
+  </h3>
 </header>
-  {% for article in articles_page.object_list %}
-  <article>
-    <h1 id="title">
-      <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title }}</a>
-    </h1>
-    <div id="article_content">
-      {{ article.summary }}
-    </div>
-  </article>
-  {% if not loop.last %}
-  <hr />
-  {% endif %}
-  {% endfor %}
+{% for article in articles_page.object_list %}
+<article>
+  <h1 id="title">
+    <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title }}</a>
+  </h1>
+  <div id="article_content">
+    {{ article.summary }}
+  </div>
+</article>
+{% if not loop.last %}
+<hr />
+{% endif %}
+{% endfor %}
 <footer>
   {% include "pagination.html" %}
 </footer>
diff --git a/templates/tag.html b/templates/tag.html
index b01f93f..71fb9b4 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -2,9 +2,12 @@
 {% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
 {% block head %}
 {% if TAG_FEED_ATOM %}
-<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag Atom Feed" />
+<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag Atom Feed" />
 {% endif %}
 {% if TAG_FEED_RSS %}
-<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag RSS Feed" />
+<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag RSS Feed" />
 {% endif %}
 {% endblock %}
+{% block headnotes %}
+{% if TAG_FEED_ATOM %}&gt; <a href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}">{{ tag }} Tag Atom Feed</a>{% endif %}
+{% endblock %}